From 6064dd482bdec479aafb1ac1a64606e1b21a3939 Mon Sep 17 00:00:00 2001 From: robertlipe Date: Mon, 7 Apr 2014 00:31:30 +0000 Subject: [PATCH] Add Mapfactor Navigator with some help from Peder Bredahl Hansen. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4794 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/GPSBabel.pro | 2 +- gpsbabel/Makefile.in | 2 +- gpsbabel/reference/mapfactor.xml | 12 +++++++ gpsbabel/reference/mapfactor~gpx.gpx | 50 +++++++++++++++++++++++++++ gpsbabel/testo.d/mapfactor.test | 7 ++++ gpsbabel/vecs.cc | 8 +++++ gpsbabel/xmldoc/formats/mapfactor.xml | 23 ++++++++++++ 7 files changed, 102 insertions(+), 2 deletions(-) create mode 100644 gpsbabel/reference/mapfactor.xml create mode 100644 gpsbabel/reference/mapfactor~gpx.gpx create mode 100644 gpsbabel/testo.d/mapfactor.test create mode 100644 gpsbabel/xmldoc/formats/mapfactor.xml diff --git a/gpsbabel/GPSBabel.pro b/gpsbabel/GPSBabel.pro index 0db9f93e8..8e7a58ea3 100644 --- a/gpsbabel/GPSBabel.pro +++ b/gpsbabel/GPSBabel.pro @@ -28,7 +28,7 @@ ALL_FMTS=$$MINIMAL_FMTS gtm.cc gpsutil.cc pcx.cc \ pocketfms_bc.cc pocketfms_fp.cc pocketfms_wp.cc naviguide.cc enigma.cc \ vpl.cc teletype.cc jogmap.cc bushnell.cc bushnell_trl.cc wintec_tes.cc \ subrip.cc garmin_xt.cc garmin_fit.cc lowranceusr4.cc \ - mtk_locus.cc googledir.cc mapbar_track.cc + mtk_locus.cc googledir.cc mapbar_track.cc mapfactor.cc DEPRECIATED_FMTS=cetus.cc copilot.cc gpspilot.cc magnav.cc psp.cc gcdb.cc quovadis.cc gpilots.cc geoniche.cc palmdoc.cc hsa_ndv.cc coastexp.cc pathaway.cc coto.cc msroute.cc mag_pdb.cc axim_gpb.cc diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in index 96a9c9c79..f9f7cf660 100644 --- a/gpsbabel/Makefile.in +++ b/gpsbabel/Makefile.in @@ -80,7 +80,7 @@ ALL_FMTS=$(MINIMAL_FMTS) gtm.o gpsutil.o \ pocketfms_bc.o pocketfms_fp.o pocketfms_wp.o naviguide.o enigma.o \ vpl.o teletype.o jogmap.o bushnell.o bushnell_trl.o wintec_tes.o \ subrip.o garmin_xt.o garmin_fit.o lowranceusr4.o \ - mtk_locus.o googledir.o mapbar_track.o + mtk_locus.o googledir.o mapbar_track.o mapfactor.o FMTS=@FMTS@ diff --git a/gpsbabel/reference/mapfactor.xml b/gpsbabel/reference/mapfactor.xml new file mode 100644 index 000000000..6ff2d7430 --- /dev/null +++ b/gpsbabel/reference/mapfactor.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/gpsbabel/reference/mapfactor~gpx.gpx b/gpsbabel/reference/mapfactor~gpx.gpx new file mode 100644 index 000000000..4040901f1 --- /dev/null +++ b/gpsbabel/reference/mapfactor~gpx.gpx @@ -0,0 +1,50 @@ + + + + + + Hoverdal F1 Sørup sande + Hoverdal F1 Sørup sande + Hoverdal F1 Sørup sande + + + Hoverdal F2 Hulmose + Hoverdal F2 Hulmose + Hoverdal F2 Hulmose + + + Hoverdal F2-1 + Hoverdal F2-1 + Hoverdal F2-1 + + + Hoverdal F3 Oldtidsagre + Hoverdal F3 Oldtidsagre + Hoverdal F3 Oldtidsagre + + + Hoverdal I1 + Hoverdal I1 + Hoverdal I1 + + + Hoverdal I2 + Hoverdal I2 + Hoverdal I2 + + + Hoverdal I3 + Hoverdal I3 + Hoverdal I3 + + + Hoverdal I4 Sø + Hoverdal I4 Sø + Hoverdal I4 Sø + + + Hoverdal P1 + Hoverdal P1 + Hoverdal P1 + + diff --git a/gpsbabel/testo.d/mapfactor.test b/gpsbabel/testo.d/mapfactor.test new file mode 100644 index 000000000..4131d33a7 --- /dev/null +++ b/gpsbabel/testo.d/mapfactor.test @@ -0,0 +1,7 @@ +# +# Mapfactor Navigator +# + +gpsbabel -i mapfactor -f ${REFERENCE}/mapfactor.xml -o gpx -F ${TMPDIR}/mapfactor.gpx -o mapfactor -F ${TMPDIR}/mapfactor.xml +compare ${REFERENCE}/mapfactor~gpx.gpx ${TMPDIR}/mapfactor.gpx +compare ${REFERENCE}/mapfactor.xml ${TMPDIR}/mapfactor.xml diff --git a/gpsbabel/vecs.cc b/gpsbabel/vecs.cc index fde23d4b1..6dfb908c6 100644 --- a/gpsbabel/vecs.cc +++ b/gpsbabel/vecs.cc @@ -175,6 +175,7 @@ extern ff_vecs_t subrip_vecs; extern ff_vecs_t format_garmin_xt_vecs; extern ff_vecs_t format_fit_vecs; extern ff_vecs_t mapbar_track_vecs; +extern ff_vecs_t mapfactor_vecs; static vecs_t vec_list[] = { @@ -1060,6 +1061,13 @@ vecs_t vec_list[] = { "trk", NULL, }, + { + &mapfactor_vecs, + "mapfactor", + "Mapfactor Navigator", + "xml", + NULL, + }, #endif // MAXIMAL_ENABLED { NULL, diff --git a/gpsbabel/xmldoc/formats/mapfactor.xml b/gpsbabel/xmldoc/formats/mapfactor.xml new file mode 100644 index 000000000..f59fa9744 --- /dev/null +++ b/gpsbabel/xmldoc/formats/mapfactor.xml @@ -0,0 +1,23 @@ + +This format can write a favourites.xml file that stores the waypoints in the Mapfactor Navigator street navigation program for Windows and Android OS. The waypoints are listed in the My places menu option. The favourites.xml file are stored in the Navigator directory. + + + +This format can read waypoints from the favourites.xml file to use in other programs. + + + + +The format has been tested with Windows 8, Navigator version 12.3 and Android OS, v4.2.2, Navigator version 1.1.5. + + + +The format has been tested with Windows 8, Navigator version 12.3 and Android OS, v4.2.2, Navigator version 1.1.5. + + + +Groups are not supported, as they don't map well to other more common +file formats. + + + -- 2.30.2